bitkeeper revision 1.1389.5.37 (427f9fd5lvofpMsmBQ2h16fsuXQH6Q)

Manual merge.

diff --cc .rootkeys
index cfb01fda7dfd935c703c8781c2de4d24751f3484,6a77bc3395c92050951399a325f83ca6452c40ac..bacaf8b1737761995a2bedc2683103177f175e0b
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -741,7 -733,7 +742,8 @@@
  3fbba6dctWRWlFJkYb6hdix2X4WMuw tools/libxc/xc_private.c
  3fbba6dcbVrG2hPzEzwdeV_UC8kydQ tools/libxc/xc_private.h
  42337174PxyzzPk62raDiYCIsfStDg tools/libxc/xc_ptrace.c
 +4273458duzL--nsTfT6e_q6Kfij48g tools/libxc/xc_ptrace_core.c
+ 41ebbfe9U0b0kI-HgjK7VEY4EvW7_w tools/libxc/xc_sedf.c
  41dde8b0pLfAKMs_L9Uri2hnzHiCRQ tools/libxc/xc_vmx_build.c
  40e1b09dMYB4ItGCqcMIzirdMd9I-w tools/libxutil/Makefile
  40e033325Sjqs-_4TuzeUEprP_gYFg tools/libxutil/allocate.c
@@@ -1259,8 -1265,10 +1261,9 @@@
  41a61536SZbR6cj1ukWTb0DYU-vz9w xen/common/multicall.c
  3ddb79bdD4SLmmdMD7yLW5HcUWucXw xen/common/page_alloc.c
  3e54c38dkHAev597bPr71-hGzTdocg xen/common/perfc.c
 -4051bcecFeq4DE70p4zGO5setf47CA xen/common/physdev.c
  3ddb79bdHqdQpATqC0rmUZNbsb6L6A xen/common/resource.c
  40589968dD2D1aejwSOvrROg7fOvGQ xen/common/sched_bvt.c
+ 41ebbfe9oF1BF3cH5v7yE3eOL9uPbA xen/common/sched_sedf.c
  3e397e6619PgAfBbw2XFbXkewvUWgw xen/common/schedule.c
  3ddb79bd0gVQYmL2zvuJnldvD0AGxQ xen/common/softirq.c
  3e7f358awXBC3Vw-wFRwPw18qL1khg xen/common/string.c

diff --cc tools/libxc/Makefile
index e458444bb053ca2b0e6d8d79504f5f7a3da89c63,f0a799f6ce070b433a73c3d396f983f42b97d7e1..041bf444232eab2a0108652cf72705e51b9bedbc
--- 1/tools/libxc/Makefile
--- 2/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@@ -16,8 -16,8 +16,9 @@@ vpath %c       $(XEN_LIBXUTIL
  INCLUDES += -I $(XEN_LIBXUTIL)
  
  SRCS     :=
+ SRCS     += xc_sedf.c
  SRCS     += xc_bvtsched.c
 +SRCS     += xc_core.c
  SRCS     += xc_domain.c
  SRCS     += xc_evtchn.c
  SRCS     += xc_gnttab.c

diff --cc tools/libxc/xc.h
Simple merge

diff --cc tools/python/xen/lowlevel/xc/xc.c
Simple merge

diff --cc tools/python/xen/xend/XendDomain.py
Simple merge

diff --cc xen/common/schedule.c
index b08e09094c7cd0d78565864c301101e957408010,9a04aae4c398b0e622a526041f87b46c9cbd7a2b..f6acf2cd5ad7fa648181fb88b8b3bc315303f0df
--- 1/xen/common/schedule.c
--- 2/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@@ -226,8 -236,12 +239,12 @@@ long do_block(void
  {
      struct exec_domain *ed = current;
  
+ #ifdef ADV_SCHED_HISTO
+     adv_sched_hist_start(current->processor);
+ #endif
+ 
      ed->vcpu_info->evtchn_upcall_mask = 0;
 -    set_bit(EDF_BLOCKED, &ed->ed_flags);
 +    set_bit(EDF_BLOCKED, &ed->flags);
  
      /* Check for events /after/ blocking: avoids wakeup waiting race. */
      if ( event_pending(ed) )
@@@ -246,7 -258,11 +263,11 @@@
  /* Voluntarily yield the processor for this allocation. */
  static long do_yield(void)
  {
 -    TRACE_2D(TRC_SCHED_YIELD, current->domain->id, current->eid);
+ #ifdef ADV_SCHED_HISTO
+     adv_sched_hist_start(current->processor);
+ #endif
+     
 +    TRACE_2D(TRC_SCHED_YIELD, current->domain->id, current->id);
      __enter_scheduler();
      return 0;
  }
@@@ -275,7 -291,7 +296,8 @@@ long do_sched_op(unsigned long op
  
      case SCHEDOP_shutdown:
      {
 -        TRACE_3D(TRC_SCHED_SHUTDOWN, current->domain->id, current->eid,
++        TRACE_3D(TRC_SCHED_SHUTDOWN, current->domain->id, current->id,
 +        TRACE_3D(TRC_SCHED_SHUTDOWN, current->domain->id, current->id,
                   (op >> SCHEDOP_reasonshift));
          domain_shutdown((u8)(op >> SCHEDOP_reasonshift));
          break;
@@@ -386,9 -449,12 +455,12 @@@ static void __enter_scheduler(void
  
      spin_unlock_irq(&schedule_data[cpu].schedule_lock);
  
-     if ( unlikely(prev == next) )
+     if ( unlikely(prev == next) ) {
+ #ifdef ADV_SCHED_HISTO
+         adv_sched_hist_to_stop(cpu);
+ #endif
 -        return;
 +        return continue_running(prev);
-     
+     }
      perfc_incrc(sched_ctx);
  
  #if defined(WAKE_HISTO)
@@@ -420,9 -486,13 +492,13 @@@
      }
  
      TRACE_4D(TRC_SCHED_SWITCH,
 -             prev->domain->id, prev->eid,
 -             next->domain->id, next->eid);
 +             prev->domain->id, prev->id,
 +             next->domain->id, next->id);
  
+ #ifdef ADV_SCHED_HISTO
+     adv_sched_hist_to_stop(cpu);
+ #endif
+ 
      context_switch(prev, next);
  }